Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 8 Jan 2010 20:59:09 +0000 (15:59 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 8 Jan 2010 20:59:09 +0000 (15:59 -0500)
commita1247306ee54c7d6f73b398110ee97e5b4627433
treea916586e505db09bba421a67f8215c4618524259
parent5bae0ab3c6886706d4a1430827cfee4bdf78ce43
parent97253d0bd7c1269b2db1eb77d53674a5d204c807
Merge from mainline.
src/dispnew.c